From adcd8dd4fc08e27f8d151896523cb8713c010d08 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 22 Jan 2024 22:52:25 +0100 Subject: [PATCH] Install PAM modules and systemd units into /usr Since Debian trixie all files need to be installed into their canonical location under /usr. Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1061348 Forwarded: https://github.com/MariaDB/server/pull/4065 Gbp-Pq: Name install-files-into-usr.patch --- cmake/install_layout.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake index 55e960a3c..d52836a4f 100644 --- a/cmake/install_layout.cmake +++ b/cmake/install_layout.cmake @@ -196,10 +196,10 @@ SET(INSTALL_MYSQLDATADIR_DEB "/var/lib/mysql") SET(INSTALL_RUNDATADIR_DEB "/run/mysqld") SET(INSTALL_UNIX_ADDRDIR_DEB "${INSTALL_RUNDATADIR_DEB}/mysqld.sock") -SET(INSTALL_SYSTEMD_UNITDIR_DEB "/lib/systemd/system") +SET(INSTALL_SYSTEMD_UNITDIR_DEB "/usr/lib/systemd/system") SET(INSTALL_SYSTEMD_SYSUSERSDIR_DEB "/usr/lib/sysusers.d") SET(INSTALL_SYSTEMD_TMPFILESDIR_DEB "/usr/lib/tmpfiles.d") -SET(INSTALL_PAMDIR_DEB "/lib/${CMAKE_CXX_LIBRARY_ARCHITECTURE}/security") +SET(INSTALL_PAMDIR_DEB "/usr/lib/${CMAKE_CXX_LIBRARY_ARCHITECTURE}/security") SET(INSTALL_PAMDATADIR_DEB "/etc/security") # -- 2.30.2